Hide GdkScreen too

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 19d9d2dfbbc06b7bf9958d17c8ab2930f0ee0217..4df0aeacf05c448bb1c96f73fee6f032ce5412de 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -316,6 +316,7 @@ struct _GdkDisplayClass
                  gboolean    is_error);
 };
 
+
 struct _GdkKeymapClass
 {
   GObjectClass parent_class;
@@ -355,6 +356,16 @@ struct _GdkKeymapClass
   void (*state_changed)     (GdkKeymap *keymap);
 };
 
+struct _GdkScreen
+{
+  GObject parent_instance;
+
+  guint closed : 1;
+
+  cairo_font_options_t *font_options;
+  double resolution; /* pixels/points scale factor for fonts */
+};
+
 struct _GdkScreenClass
 {
   GObjectClass parent_class;

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 030caad009abce5af636d838e11b4332d2cc6ca9..4b11320a4a669720fbfebd9a6cc2e620372e157e 100644 (file)
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -43,25 +43,6 @@ typedef struct _GdkScreenClass GdkScreenClass;
 #define GDK_IS_SCREEN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_SCREEN))
 #define GDK_SCREEN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_SCREEN, GdkScreenClass))
 
-/**
- * GdkScreen:
- *
- * This is a currently just a placeholder typedef for the first argument of
- * the #GdkPointerHooks.window_at_pointer function in #GdkPointerHooks.
- * It will be used  when GDK gets multihead support.
- *
- * Since: 2.2
- */
-struct _GdkScreen
-{
-  GObject parent_instance;
-
-  guint GSEAL (closed) : 1;
-
-  cairo_font_options_t *GSEAL (font_options);
-  double GSEAL (resolution);   /* pixels/points scale factor for fonts */
-};
-
 GType        gdk_screen_get_type              (void) G_GNUC_CONST;
 GdkVisual*   gdk_screen_get_system_visual     (GdkScreen   *screen);
 GdkVisual *  gdk_screen_get_rgba_visual       (GdkScreen   *screen);
@@ -118,4 +99,4 @@ GList     *gdk_screen_get_window_stack  (GdkScreen *screen);
 
 G_END_DECLS
 
-#endif                         /* __GDK_SCREEN_H__ */
+#endif  /* __GDK_SCREEN_H__ */

diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index ce1e1f9e1bc6ac2adbe682ae2d9de23ee02caec3..410cade6d91a45b5ad9e1e58765b4aebaa709e34 100644 (file)
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -134,9 +134,9 @@ typedef guint32 GdkNativeWindow;
  
 /* Forward declarations of commonly used types
  */
-typedef struct _GdkColor             GdkColor;
+typedef struct _GdkColor              GdkColor;
 typedef struct _GdkRGBA               GdkRGBA;
-typedef struct _GdkCursor            GdkCursor;
+typedef struct _GdkCursor             GdkCursor;
 typedef struct _GdkVisual             GdkVisual;
 
 /**
@@ -145,8 +145,8 @@ typedef struct _GdkVisual             GdkVisual;
  * An opaque structure representing an onscreen drawable.
  */
 typedef struct _GdkWindow             GdkWindow;
-typedef struct _GdkDisplay           GdkDisplay;
-typedef struct _GdkScreen            GdkScreen;
+typedef struct _GdkDisplay            GdkDisplay;
+typedef struct _GdkScreen             GdkScreen;
 typedef struct  GdkAppLaunchContext   GdkAppLaunchContext;
 
 /**